Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 19 Sep 2011 21:59:38 +0000 (14:59 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 19 Sep 2011 21:59:38 +0000 (14:59 -0700)

Trivial merge